def make_album(singer, album, song_num = None):
    if song_num:
        albums = {
            'singer': singer.title(),
            'album': album.title(),
            'Number of songs': song_num
        }
    else:
        albums = {
            'singer': singer.title(),
            'album': album.title()
        }
    return albums

while True:
    name = input("Singer's name: ")
    if name == 'q':
        break
    album = input("Album's name: ")
    if album == 'q':
        break
    print(make_album(name, album))